Update celluloid and delayed_job to avoid potential memory issues

Andrew Cantino 8 年之前
父節點
當前提交
a8dc447d04
共有 2 個文件被更改,包括 35 次插入20 次删除
  1. 2 2
      Gemfile
  2. 33 18
      Gemfile.lock

+ 2 - 2
Gemfile

@@ -70,8 +70,8 @@ gem 'bootstrap-kaminari-views', '~> 0.0.3'
70 70
 gem 'bundler', '>= 1.5.0'
71 71
 gem 'coffee-rails', '~> 4.1.0'
72 72
 gem 'daemons', '~> 1.1.9'
73
-gem 'delayed_job', '~> 4.0.0'
74
-gem 'delayed_job_active_record', :git => 'https://github.com/cantino/delayed_job_active_record', :branch => 'configurable-reserve-sql-strategy'
73
+gem 'delayed_job', '~> 4.1.0'
74
+gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'
75 75
 gem 'devise', '~> 3.4.0'
76 76
 gem 'em-http-request', '~> 1.1.2'
77 77
 gem 'faraday', '~> 0.9.0'

+ 33 - 18
Gemfile.lock

@@ -20,6 +20,15 @@ GIT
20 20
       rest-client (~> 1.8)
21 21
 
22 22
 GIT
23
+  remote: git://github.com/collectiveidea/delayed_job_active_record.git
24
+  revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad
25
+  branch: master
26
+  specs:
27
+    delayed_job_active_record (4.1.0)
28
+      activerecord (>= 3.0, < 5.1)
29
+      delayed_job (>= 3.0, < 5)
30
+
31
+GIT
23 32
   remote: git://github.com/lostisland/faraday_middleware.git
24 33
   revision: c5836ae55857272732b33eb0e0a98d60e995a376
25 34
   branch: master
@@ -49,15 +58,6 @@ GIT
49 58
       omniauth (~> 1.0)
50 59
       omniauth-oauth2 (~> 1.1)
51 60
 
52
-GIT
53
-  remote: https://github.com/cantino/delayed_job_active_record
54
-  revision: 7ede4ea81561a66427f600decb87f6fcdb5b8aa4
55
-  branch: configurable-reserve-sql-strategy
56
-  specs:
57
-    delayed_job_active_record (4.0.3)
58
-      activerecord (>= 3.0, < 5.0)
59
-      delayed_job (>= 3.0, < 4.1)
60
-
61 61
 PATH
62 62
   remote: vendor/gems/dotenv-2.0.1
63 63
   specs:
@@ -131,8 +131,23 @@ GEM
131 131
     capistrano-rails (1.1.3)
132 132
       capistrano (~> 3.1)
133 133
       capistrano-bundler (~> 1.1)
134
-    celluloid (0.16.0)
135
-      timers (~> 4.0.0)
134
+    celluloid (0.17.2)
135
+      celluloid-essentials
136
+      celluloid-extras
137
+      celluloid-fsm
138
+      celluloid-pool
139
+      celluloid-supervision
140
+      timers (>= 4.1.1)
141
+    celluloid-essentials (0.20.5)
142
+      timers (>= 4.1.1)
143
+    celluloid-extras (0.20.5)
144
+      timers (>= 4.1.1)
145
+    celluloid-fsm (0.20.5)
146
+      timers (>= 4.1.1)
147
+    celluloid-pool (0.20.5)
148
+      timers (>= 4.1.1)
149
+    celluloid-supervision (0.20.5)
150
+      timers (>= 4.1.1)
136 151
     chronic (0.10.2)
137 152
     coderay (1.1.0)
138 153
     coffee-rails (4.1.0)
@@ -154,7 +169,7 @@ GEM
154 169
       safe_yaml (~> 1.0.0)
155 170
     daemons (1.1.9)
156 171
     debug_inspector (0.0.2)
157
-    delayed_job (4.0.6)
172
+    delayed_job (4.1.1)
158 173
       activesupport (>= 3.0, < 5.0)
159 174
     delorean (2.1.0)
160 175
       chronic
@@ -248,7 +263,7 @@ GEM
248 263
     haversine (0.3.0)
249 264
     hipchat (1.2.0)
250 265
       httparty
251
-    hitimes (1.2.2)
266
+    hitimes (1.2.3)
252 267
     hpricot (0.8.6)
253 268
     httmultiparty (0.3.10)
254 269
       httparty (>= 0.7.3)
@@ -284,7 +299,7 @@ GEM
284 299
       actionmailer (>= 3.2)
285 300
       letter_opener (~> 1.0)
286 301
       railties (>= 3.2)
287
-    libv8 (3.16.14.7)
302
+    libv8 (3.16.14.13)
288 303
     liquid (3.0.6)
289 304
     listen (2.7.9)
290 305
       celluloid (>= 0.15.2)
@@ -303,7 +318,7 @@ GEM
303 318
     mime-types (2.6.1)
304 319
     mini_magick (4.2.3)
305 320
     mini_portile2 (2.0.0)
306
-    minitest (5.8.1)
321
+    minitest (5.8.3)
307 322
     mqtt (0.3.1)
308 323
     multi_json (1.11.2)
309 324
     multi_xml (0.5.5)
@@ -399,7 +414,7 @@ GEM
399 414
     rb-fsevent (0.9.4)
400 415
     rb-inotify (0.9.5)
401 416
       ffi (>= 0.5.0)
402
-    ref (1.0.5)
417
+    ref (2.0.0)
403 418
     responders (2.1.0)
404 419
       railties (>= 4.2.0, < 5)
405 420
     rest-client (1.8.0)
@@ -490,7 +505,7 @@ GEM
490 505
     thor (0.19.1)
491 506
     thread_safe (0.3.5)
492 507
     tilt (1.4.1)
493
-    timers (4.0.1)
508
+    timers (4.1.1)
494 509
       hitimes
495 510
     tins (1.3.2)
496 511
     treetop (1.5.3)
@@ -554,7 +569,7 @@ DEPENDENCIES
554 569
   coffee-rails (~> 4.1.0)
555 570
   coveralls
556 571
   daemons (~> 1.1.9)
557
-  delayed_job (~> 4.0.0)
572
+  delayed_job (~> 4.1.0)
558 573
   delayed_job_active_record!
559 574
   delorean
560 575
   devise (~> 3.4.0)